Revert an accidental change

svn path=/trunk/; revision=21837

diff --git a/ChangeLog b/ChangeLog
index 4dfa9959cbf6e5684307e7cfc6349ebf2eec0bb8..da3dc648971b1ed61f83852eeb93b8a9916c67b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-01  Matthisa Clasen <mclasen@redhat.com>
+
+       * gtk/gtkentry.c: Revert an accidental change that sneaked
+       in with the last commit.
+
 2008-12-01  Paul Bolle  <pebolle@tiscali.nl>
 
        Bug 562817 – GtkDialog: typo

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 4f55c4804c5f9b1336dc9ba194e54c3924c71ebb..b838ac4d07d5f29655764d5c081b183f8ff83631 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -333,6 +333,7 @@ static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
                                                        CursorType      type,
                                                        gint           *strong_x,
                                                        gint           *weak_x);
+static void         gtk_entry_adjust_scroll            (GtkEntry       *entry);
 static gint         gtk_entry_move_visually            (GtkEntry       *editable,
                                                        gint            start,
                                                        gint            count);
@@ -1479,7 +1480,7 @@ gtk_entry_realize (GtkWidget *widget)
 
   gtk_im_context_set_client_window (entry->im_context, entry->text_area);
 
-  _gtk_entry_adjust_scroll (entry);
+  gtk_entry_adjust_scroll (entry);
   gtk_entry_update_primary_selection (entry);
 }
 
@@ -3441,7 +3442,7 @@ recompute_idle_func (gpointer data)
   
   if (gtk_widget_has_screen (GTK_WIDGET (entry)))
     {
-      _gtk_entry_adjust_scroll (entry);
+      gtk_entry_adjust_scroll (entry);
       gtk_entry_queue_draw (entry);
       
       update_im_cursor_location (entry);
@@ -4041,8 +4042,8 @@ gtk_entry_get_cursor_locations (GtkEntry   *entry,
     }
 }
 
-void
-_gtk_entry_adjust_scroll (GtkEntry *entry)
+static void
+gtk_entry_adjust_scroll (GtkEntry *entry)
 {
   GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
   gint min_offset, max_offset;